Delete content on flag approval

Author: akatsoulas

kitsune/flagit/models.py

@@ -65,3 +65,20 @@ class Meta:
         unique_together = (("content_type", "object_id", "creator"),)
         ordering = ["created"]
         permissions = (("can_moderate", "Can moderate flagged objects"),)
+
+    def save(self, *args, **kwargs):
+        owner = None
+        if hasattr(self.content_object, "creator"):
+            owner = self.content_object.creator
+        elif hasattr(self.content_object, "author"):
+            owner = self.content_object.author
+
+        if (
+            int(self.status) == FlaggedObject.FLAG_ACCEPTED
+            and owner
+            and owner.profile.is_system_account
+        ):
+            self.content_object.delete()
+            self.delete()
+            return
+        super().save(*args, **kwargs)

kitsune/flagit/tests/test_models.py

@@ -0,0 +1,51 @@
+from kitsune.flagit.models import FlaggedObject
+from kitsune.forums.models import Post
+from kitsune.forums.tests import PostFactory
+from kitsune.sumo.tests import TestCase
+from kitsune.users.models import Profile
+from kitsune.users.tests import UserFactory
+
+
+class FlaggedObjectTests(TestCase):
+    def setUp(self):
+        self.user = UserFactory()
+        self.system_user = UserFactory()
+        self.system_user.profile.account_type = Profile.AccountType.SYSTEM
+        self.system_user.profile.save()
+        self.system_user_post = PostFactory(author=self.system_user)
+        self.post = PostFactory()
+
+    def test_save_with_deletion(self):
+        """Test save that triggers deletion when conditions are met"""
+        flag = FlaggedObject.objects.create(
+            status=FlaggedObject.FLAG_PENDING,
+            content_object=self.system_user_post,
+            creator=self.user,
+        )
+
+        self.assertTrue(FlaggedObject.objects.filter(id=flag.id).exists())
+        flag.status = FlaggedObject.FLAG_ACCEPTED
+        flag.save()
+        self.assertFalse(FlaggedObject.objects.filter(id=flag.id).exists())
+        self.assertFalse(Post.objects.filter(id=self.system_user_post.id).exists())
+
+    def test_save_with_accepted_non_system_user(self):
+        """Test save with accepted status but non-system user"""
+        flag = FlaggedObject.objects.create(
+            status=FlaggedObject.FLAG_ACCEPTED,
+            content_object=self.post,
+            creator=self.user,
+        )
+        self.assertTrue(Post.objects.filter(id=self.post.id).exists())
+        self.assertTrue(FlaggedObject.objects.filter(id=flag.id).exists())
+
+    def test_save_with_system_user_non_accepted(self):
+        """Test save with system user but non-accepted status"""
+        flag = FlaggedObject.objects.create(
+            status=FlaggedObject.FLAG_PENDING,
+            content_object=self.system_user_post,
+            creator=self.user,
+        )
+
+        self.assertTrue(Post.objects.filter(id=self.system_user_post.id).exists())
+        self.assertTrue(FlaggedObject.objects.filter(id=flag.id).exists())

kitsune/forums/handlers.py

@@ -1,7 +1,5 @@
 from django.contrib.auth.models import User
-from django.contrib.contenttypes.models import ContentType
 
-from kitsune.flagit.models import FlaggedObject
 from kitsune.forums.models import Post, Thread
 from kitsune.users.handlers import UserDeletionListener
 from kitsune.users.models import Profile
@@ -20,19 +18,4 @@ class PostListener(UserDeletionListener):
     """Handles post cleanup when a user is deleted."""
 
     def on_user_deletion(self, user: User) -> None:
-        posts = Post.objects.filter(author=user)
-
-        post_content_type = ContentType.objects.get_for_model(Post)
-
-        flagged_posts = Post.objects.filter(
-            id__in=FlaggedObject.objects.filter(
-                content_type=post_content_type, object_id__in=posts.values_list("id", flat=True)
-            ).values_list("object_id", flat=True)
-        )
-
-        for post in flagged_posts:
-            post.delete()
-
-        Post.objects.filter(author=user).exclude(
-            id__in=flagged_posts.values_list("id", flat=True)
-        ).update(author=Profile.get_sumo_bot())
+        Post.objects.filter(author=user).update(author=Profile.get_sumo_bot())

kitsune/forums/tests/test_handlers.py

@@ -1,8 +1,5 @@
-from django.contrib.contenttypes.models import ContentType
-
-from kitsune.flagit.models import FlaggedObject
 from kitsune.forums.handlers import PostListener, ThreadListener
-from kitsune.forums.models import Post, Thread
+from kitsune.forums.models import Thread
 from kitsune.forums.tests import PostFactory, ThreadFactory
 from kitsune.sumo.tests import TestCase
 from kitsune.users.models import Profile
@@ -92,34 +89,3 @@ def test_other_users_posts_unaffected(self):
         post2.refresh_from_db()
         self.assertEqual(post1.author.username, self.sumo_bot.username)
         self.assertEqual(post2.author, other_user)
-
-    def test_flagged_posts_deletion(self):
-        """Test that flagged posts are deleted."""
-        post1 = PostFactory(author=self.user)
-        post2 = PostFactory(author=self.user)
-        post3 = PostFactory(author=self.user)
-
-        post_content_type = ContentType.objects.get_for_model(Post)
-
-        FlaggedObject.objects.create(
-            content_type=post_content_type,
-            object_id=post1.id,
-            creator=UserFactory(),
-            reason=FlaggedObject.REASON_SPAM,
-        )
-        FlaggedObject.objects.create(
-            content_type=post_content_type,
-            object_id=post2.id,
-            creator=UserFactory(),
-            reason=FlaggedObject.REASON_SPAM,
-        )
-
-        self.listener.on_user_deletion(self.user)
-
-        with self.assertRaises(Post.DoesNotExist):
-            post1.refresh_from_db()
-        with self.assertRaises(Post.DoesNotExist):
-            post2.refresh_from_db()
-
-        post3.refresh_from_db()
-        self.assertEqual(post3.author.username, self.sumo_bot.username)